If a required action is missing, don't recurse over the children.

2006-12-27  Matthias Clasen  <mclasen@redhat.com>

        * gtk/gtkuimanager.c (update_node): If a required action
        is missing, don't recurse over the children.  (#349119,
        Chris Moller)

diff --git a/ChangeLog b/ChangeLog
index 8e013fcfd83e53810b9c841ec57b69204f7f32ab..e7f92438e5697ca4b4b6edaa0d2b9a6ac5bbefa7 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,4 +1,10 @@
-2006-12-17  Matthias Clasen  <mclasen@redhat.com>
+2006-12-27  Matthias Clasen  <mclasen@redhat.com>
+
+       * gtk/gtkuimanager.c (update_node): If a required action
+       is missing, don't recurse over the children.  (#349119,
+       Chris Moller)
+
+2006-12-27  Matthias Clasen  <mclasen@redhat.com>
 
        Fix a few problems with nested menus in comboboxes
        (#386694, Yevgen Muntyan)

diff --git a/gtk/gtkuimanager.c b/gtk/gtkuimanager.c
index 9e241c946a8fc777778fd45ddd7386c8d70d2105..25c25642f2d6a56725d20ab707e967a551522ef9 100644 (file)
--- a/gtk/gtkuimanager.c
+++ b/gtk/gtkuimanager.c
@@ -2133,9 +2133,9 @@ update_node (GtkUIManager *self,
       info->type != NODE_TYPE_MENU_PLACEHOLDER &&
       info->type != NODE_TYPE_TOOLBAR_PLACEHOLDER)
     {
-      g_warning ("%s: missing action", info->name);
+      g_warning ("%s: missing action %s", info->name, action_name);
       
-      goto recurse_children;
+      return;
     }
   
   if (action)